[IA64] minor fix for sparse-merge

Here's another sparse-merge patch to allow ARCH to be set on the
command-line, and to add -C to the final hg update since it's probably
switching between branches.

Signed-off-by: Aron Griffis <aron@hp.com>

diff --git a/xen/arch/ia64/tools/sparse-merge b/xen/arch/ia64/tools/sparse-merge
index 09b2a9b6633a2aedda34217b7ea5c768964dc667..dbca0c99beb790e7480f8155336509538bb09ec6 100755 (executable)
--- a/xen/arch/ia64/tools/sparse-merge
+++ b/xen/arch/ia64/tools/sparse-merge
@@ -10,6 +10,8 @@
 # Tag of new upstream base to go to
 : ${NEWTAG:=v$(wget -O- -o/dev/null http://kernel.org/kdist/finger_banner \
     | awk '/latest stable/{print $NF}')}
+# Restrict merge to specific arch (set to . for all)
+: ${ARCH:=ia64}
 
 SPARSEDIR=linux-2.6-xen-sparse
 
@@ -35,7 +37,7 @@ for t in $OLDTAG $NEWTAG; do
 done
 hg up -C $OLDTAG || exit 1
 cd $WD
-for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep ia64); do
+for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep "$ARCH"); do
        cd $WD
 
        FILENAME=$(basename $i)
@@ -133,5 +135,5 @@ for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep ia64); do
        fi
 done
 cd $LINUXPATH
-hg up $OLDCSET
+hg up -C $OLDCSET
 cd $WD